From c210c79d65ba20be9ea0d22badc1fd262c38373c Mon Sep 17 00:00:00 2001 From: robertl Date: Thu, 20 Jul 2006 20:55:21 +0000 Subject: [PATCH] Toss tiny line when reading gpsutil files. --- gpsutil.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gpsutil.c b/gpsutil.c index 768fc5e6f..ed82be57c 100644 --- a/gpsutil.c +++ b/gpsutil.c @@ -75,12 +75,17 @@ data_read(void) tin = textfile_init(file_in); while ((ibuf = textfile_read(tin))) { + int n; /* A sharp in column zero or an blank line is a comment */ ibuf = lrtrim(ibuf); if (ibuf[0] == '#' || ibuf[0] == '\n') continue; - sscanf(ibuf, "%s %le%c %le%c %ld%c %30[^,] %c", + n = sscanf(ibuf, "%s %le%c %le%c %ld%c %30[^,] %c", name, &lat, &latdir, &lon, &londir, &alt, &alttype, desc, icon); + /* Require at least first threee fields, otherwise ignore */ + if (n < 3) { + continue; + } desc[0] = '\0'; icon[0] = '\0'; sscanf(&ibuf[39], "%30c", desc); -- 2.30.2